home *** CD-ROM | disk | FTP | other *** search
/ Linux Cubed Series 7: Sunsite / Linux Cubed Series 7 - Sunsite Vol 1.iso / system / network / chat / colirc.pat / colirc.patch
Encoding:
Text File  |  1995-12-19  |  25.6 KB  |  858 lines
  1. diff --unified --recursive --new-file ./Makefile.in ../colirc/Makefile.in
  2. --- ./Makefile.in    Wed Jan  4 22:40:23 1995
  3. +++ ../colirc/Makefile.in    Sun Dec 17 14:51:53 1995
  4. @@ -27,7 +27,7 @@
  5.  
  6.  # Where the ircII binary will be installed.
  7.  # 'make install' will compile and install the program
  8. -INSTALL_IRC = $(bindir)/irc
  9. +INSTALL_IRC = $(bindir)/colirc
  10.  
  11.  # Where the ircII library will be.  Generally this is the place that
  12.  # you put the scripts, help pages and translation tables.  It is
  13. @@ -181,7 +181,7 @@
  14.  installbin: installirc installserv installflush installwserv
  15.  
  16.  installirc: irc installdirs
  17. -    $(INSTALL) source/irc $(INSTALL_IRC)-$(VERSION)
  18. +    $(INSTALL) source/colirc $(INSTALL_IRC)-$(VERSION)
  19.      @if test -f $(INSTALL_IRC).old; then $(RM) $(INSTALL_IRC).old; fi
  20.      @if test -f $(INSTALL_IRC); then $(MV) $(INSTALL_IRC) $(INSTALL_IRC).old; fi
  21.      $(RM) $(INSTALL_IRC)
  22. diff --unified --recursive --new-file ./README.colirc ../colirc/README.colirc
  23. --- ./README.colirc    Wed Dec 31 16:00:00 1969
  24. +++ ../colirc/README.colirc    Sun Dec 17 17:52:16 1995
  25. @@ -0,0 +1,28 @@
  26. +colirc patch 0.11 <ircii 2.8.2>
  27. +bitching and whatnot goes to escrafrd@oz.net <MadHacker on LinuxNet>
  28. +
  29. +/color to change color of nicks
  30. +/set colorline on to turn on full line color <default off>
  31. +/rcolor to set colors picked to colorise nicks
  32. +
  33. +_USAGE_
  34. +
  35. +colors: black red green brown blue purple cyan white
  36. +for bright colors prefix b to the color <bred for bright red, etc>
  37. +
  38. +/color nick color
  39. +/rcolor +color or -color <-all and +all can be used>
  40. +/rcolor can accept multiple args </rcolor -all +red +green +blue>
  41. +
  42. +notes...
  43. +
  44. +if a nick does not have a color set to it<with /color> then it will have one
  45. +assigned to it based on the first two chars of the nick. the colors assigned
  46. +can be picked with /rcolor. default is all colors except black.
  47. +
  48. +if you have colorline set on, the whole line said by a person will be the
  49. +color of thier nick.
  50. +
  51. +you can change the color of channels if you are in multiple channels at
  52. +once. </set #channel green>
  53. +
  54. diff --unified --recursive --new-file ./include/color.h ../colirc/include/color.h
  55. --- ./include/color.h    Wed Dec 31 16:00:00 1969
  56. +++ ../colirc/include/color.h    Sun Dec 17 14:51:53 1995
  57. @@ -0,0 +1,32 @@
  58. +#ifndef _COLOR_H_
  59. +#define _COLOR_H_
  60. +/* define colors as control chars */
  61. +#define BLACK           '\027'
  62. +#define RED             BLACK+1
  63. +#define GREEN           BLACK+2
  64. +#define BROWN           BLACK+3
  65. +#define BLUE            BLACK+4
  66. +#define PURPLE          BLACK+5
  67. +#define CYAN            BLACK+6
  68. +#define WHITE           BLACK+7
  69. +#define BRIGHT          '\025'
  70. +
  71. +#define SAY_COLOR BLUE
  72. +
  73. +#ifndef TRUE
  74. +#define TRUE 1
  75. +#endif
  76. +
  77. +typedef struct _name_color  
  78. +{
  79. +        char *name;
  80. +        char colorstr[5];
  81. +        struct _name_color *next;
  82. +} name_color;
  83. +
  84. +extern  void    colorcmd _((char *, char *, char *));
  85. +extern  void    rcolorcmd _((char *, char *, char *));
  86. +char *color_of();
  87. +name_color *find_nc_name();
  88. +char *tolower_str();
  89. +#endif /* _COLOR_H_ */
  90. diff --unified --recursive --new-file ./include/config.h ../colirc/include/config.h
  91. --- ./include/config.h    Fri Jan 20 17:36:03 1995
  92. +++ ../colirc/include/config.h    Sun Dec 17 17:50:39 1995
  93. @@ -152,6 +152,7 @@
  94.  #define DEFAULT_CLOCK_24HOUR 1
  95.  #define DEFAULT_CLOCK_ALARM NULL
  96.  #define DEFAULT_CMDCHARS "/"
  97. +#define DEFAULT_COLORLINE 0
  98.  #define DEFAULT_COMMAND_MODE 0
  99.  #define DEFAULT_CONTINUED_LINE "  "
  100.  #define DEFAULT_DCC_BLOCK_SIZE 512
  101. diff --unified --recursive --new-file ./include/config.h.dist ../colirc/include/config.h.dist
  102. --- ./include/config.h.dist    Mon Oct 17 04:58:26 1994
  103. +++ ../colirc/include/config.h.dist    Sun Dec 17 14:51:53 1995
  104. @@ -23,7 +23,7 @@
  105.   * to your nearest servers.  However if you use a seperate 'ircII.servers'
  106.   * file and the ircII can find it, this setting is overridden.
  107.   */
  108. -#define DEFAULT_SERVER        "change.this.to.a.server"
  109. +#define DEFAULT_SERVER        "irc.cabi.net"
  110.  
  111.  /*
  112.   * Uncomment the following if the gecos field of your /etc/passwd has other
  113. @@ -153,6 +153,7 @@
  114.  #define DEFAULT_CLOCK_24HOUR 1
  115.  #define DEFAULT_CLOCK_ALARM NULL
  116.  #define DEFAULT_CMDCHARS "/"
  117. +#define DEFAULT_COLORLINE 0
  118.  #define DEFAULT_COMMAND_MODE 0
  119.  #define DEFAULT_CONTINUED_LINE "+"
  120.  #define DEFAULT_DCC_BLOCK_SIZE 512
  121. diff --unified --recursive --new-file ./include/irc.h ../colirc/include/irc.h
  122. --- ./include/irc.h    Mon Jan  2 05:31:40 1995
  123. +++ ../colirc/include/irc.h    Sun Dec 17 17:52:46 1995
  124. @@ -12,7 +12,7 @@
  125.  #ifndef __irc_h
  126.  #define __irc_h
  127.  
  128. -#define IRCII_COMMENT   "this is a bug free client.  honest"
  129. +#define IRCII_COMMENT   "colirc"
  130.  
  131.  #define IRCRC_NAME "/.ircrc"
  132.  
  133. diff --unified --recursive --new-file ./include/vars.h.proto ../colirc/include/vars.h.proto
  134. --- ./include/vars.h.proto    Fri Jan  6 07:23:36 1995
  135. +++ ../colirc/include/vars.h.proto    Sun Dec 17 14:51:53 1995
  136. @@ -50,6 +50,7 @@
  137.  #define CLOCK_24HOUR_VAR $
  138.  #define CLOCK_ALARM_VAR $
  139.  #define CMDCHARS_VAR $
  140. +#define COLORLINE_VAR $
  141.  #define COMMAND_MODE_VAR $
  142.  #define CONTINUED_LINE_VAR $
  143.  #define DCC_BLOCK_SIZE_VAR $
  144. diff --unified --recursive --new-file ./source/Makefile.in ../colirc/source/Makefile.in
  145. --- ./source/Makefile.in    Thu Dec 29 03:02:44 1994
  146. +++ ../colirc/source/Makefile.in    Sun Dec 17 15:40:20 1995
  147. @@ -15,14 +15,14 @@
  148.  LN    = @LN@
  149.  RM    = @RM@
  150.  
  151. -OBJECTS = alias.o crypt.o ctcp.o dcc.o debug.o edit.o exec.o flood.o\
  152. +OBJECTS = alias.o color.o crypt.o ctcp.o dcc.o debug.o edit.o exec.o flood.o\
  153.      funny.o help.o history.o hold.o hook.o if.o ignore.o input.o\
  154.      irc.o ircaux.o ircsig.o keys.o lastlog.o list.o log.o mail.o\
  155.      menu.o names.o newio.o notice.o notify.o numbers.o output.o\
  156.      parse.o queue.o reg.o scandir.o screen.o server.o stack.o\
  157.      status.o term.o translat.o vars.o whois.o window.o $(PP_OBJS)
  158.  
  159. -SOURCES = alias.c crypt.c ctcp.c dcc.c debug.o edit.c exec.c flood.c\
  160. +SOURCES = alias.c color.c crypt.c ctcp.c dcc.c debug.o edit.c exec.c flood.c\
  161.      funny.c help.c history.c hold.c hook.c if.c ignore.c input.c\
  162.      irc.c ircaux.c ircsig.c keys.c lastlog.c list.c log.c mail.c\
  163.      menu.c names.c newio.c notice.c notify.c numbers.c output.c\
  164. @@ -42,7 +42,7 @@
  165.  default:
  166.      (cd ..;make)
  167.  
  168. -all: irc
  169. +all: colirc
  170.  
  171.  # got I hate typos.
  172.  clena: clean
  173. @@ -50,12 +50,12 @@
  174.  .c.o:
  175.      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -c $<
  176.  
  177. -irc: $(OBJECTS)
  178. -    $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -o irc $(OBJECTS) $(LIBS)
  179. +colirc: $(OBJECTS)
  180. +    $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -o colirc $(OBJECTS) $(LIBS)
  181.  clean::
  182. -    $(RM) irc $(OBJECTS)
  183. +    $(RM) colirc $(OBJECTS)
  184.  
  185. -install: irc
  186. +install: colirc
  187.      cd ..; $(MAKE) install
  188.  
  189.  # .o files needing special compilation flags
  190. @@ -141,6 +141,8 @@
  191.    ../include/history.h ../include/vars.h ../include/ircaux.h ../include/server.h \
  192.    ../include/screen.h ../include/window.h ../include/hold.h ../include/lastlog.h \
  193.    ../include/menu.h ../include/input.h ../include/names.h ../include/output.h 
  194. +color.o: color.c ../include/irc.h ../include/color.h ../include/vars.h \
  195. +  ../include/output.h
  196.  crypt.o: crypt.c ../include/irc.h ../include/defs.h ../include/config.h ../include/irc_std.h \
  197.    ../include/debug.h ../include/crypt.h ../include/vars.h ../include/ircaux.h \
  198.    ../include/list.h ../include/ctcp.h ../include/output.h 
  199. @@ -164,7 +166,8 @@
  200.    ../include/keys.h ../include/names.h ../include/alias.h ../include/history.h \
  201.    ../include/funny.h ../include/ctcp.h ../include/dcc.h ../include/translat.h \
  202.    ../include/output.h ../include/exec.h ../include/notify.h ../include/numbers.h \
  203. -  ../include/status.h ../include/if.h ../include/help.h ../include/stack.h ../include/queue.h 
  204. +  ../include/status.h ../include/if.h ../include/help.h ../include/stack.h \
  205. +  ../include/queue.h ../include/color.h
  206.  exec.o: exec.c ../include/irc.h ../include/defs.h ../include/config.h ../include/irc_std.h \
  207.    ../include/debug.h ../include/exec.h ../include/vars.h ../include/ircaux.h ../include/edit.h \
  208.    ../include/window.h ../include/hold.h ../include/lastlog.h ../include/menu.h \
  209. @@ -267,13 +270,14 @@
  210.    ../include/debug.h ../include/output.h ../include/vars.h ../include/input.h \
  211.    ../include/term.h ../include/lastlog.h ../include/window.h ../include/hold.h \
  212.    ../include/edit.h ../include/menu.h ../include/screen.h ../include/hook.h ../include/ctcp.h \
  213. -  ../include/log.h 
  214. +  ../include/log.h ../include/color.h
  215.  parse.o: parse.c ../include/irc.h ../include/defs.h ../include/config.h ../include/irc_std.h \
  216.    ../include/debug.h ../include/server.h ../include/names.h ../include/window.h \
  217.    ../include/hold.h ../include/lastlog.h ../include/edit.h ../include/menu.h ../include/vars.h \
  218.    ../include/ctcp.h ../include/hook.h ../include/ignore.h ../include/whois.h ../include/ircaux.h \
  219.    ../include/funny.h ../include/crypt.h ../include/term.h ../include/flood.h ../include/screen.h \
  220. -  ../include/output.h ../include/numbers.h ../include/parse.h ../include/notify.h 
  221. +  ../include/output.h ../include/numbers.h ../include/parse.h ../include/notify.h \
  222. +  ../include/color.h
  223.  queue.o: queue.c ../include/irc.h ../include/defs.h ../include/config.h ../include/irc_std.h \
  224.    ../include/debug.h ../include/alias.h ../include/ircaux.h ../include/output.h \
  225.    ../include/edit.h ../include/if.h ../include/queue.h 
  226. @@ -285,7 +289,7 @@
  227.    ../include/lastlog.h ../include/edit.h ../include/menu.h ../include/output.h \
  228.    ../include/vars.h ../include/server.h ../include/list.h ../include/term.h ../include/names.h \
  229.    ../include/ircaux.h ../include/input.h ../include/log.h ../include/hook.h ../include/dcc.h \
  230. -  ../include/translat.h ../include/exec.h 
  231. +  ../include/translat.h ../include/exec.h ../include/color.h
  232.  server.o: server.c ../include/irc.h ../include/defs.h ../include/config.h ../include/irc_std.h \
  233.    ../include/debug.h ../include/server.h ../include/ircaux.h ../include/whois.h \
  234.    ../include/lastlog.h ../include/exec.h ../include/window.h ../include/hold.h \
  235. @@ -299,7 +303,7 @@
  236.    ../include/vars.h ../include/hook.h ../include/input.h ../include/edit.h ../include/window.h \
  237.    ../include/hold.h ../include/lastlog.h ../include/menu.h ../include/screen.h \
  238.    ../include/mail.h ../include/output.h ../include/names.h ../include/ircaux.h \
  239. -  ../include/translat.h 
  240. +  ../include/translat.h ../include/color.h
  241.  term.o: term.c ../include/irc.h ../include/defs.h ../include/config.h ../include/irc_std.h \
  242.    ../include/debug.h ../include/term.h ../include/translat.h ../include/window.h \
  243.    ../include/hold.h ../include/lastlog.h ../include/edit.h ../include/menu.h ../include/screen.h 
  244. diff --unified --recursive --new-file ./source/color.c ../colirc/source/color.c
  245. --- ./source/color.c    Wed Dec 31 16:00:00 1969
  246. +++ ../colirc/source/color.c    Sun Dec 17 15:48:16 1995
  247. @@ -0,0 +1,310 @@
  248. +/* a color irc hack similar to circ, with some more features...
  249. + * since the source for circ was not found, this is completely from scratch
  250. + * bugs, ideas, and whatnot can be sent to escrafrd@oz.net <MadHacker on LinuxNet>
  251. + */
  252. +
  253. +#include "irc.h"
  254. +#include "output.h"
  255. +#include "vars.h"
  256. +#include "color.h"
  257. +
  258. +char rcolors[16]={0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1};
  259. +char colorstring[5];
  260. +name_color *nc_start = NULL;
  261. +name_color *nc_last = NULL;
  262. +
  263. +void
  264. +rcolorcmd(command, args, subargs)
  265. +        char    *command,
  266. +                *args,
  267. +                *subargs;
  268. +{
  269. +        char *arg;
  270. +        char colorstr[5];
  271. +        int x;
  272. +    int bright;
  273. +    int char_;
  274. +    char brightstr[]="bright ";
  275. +    char *selectstr[2]= {"deselected", "selected"};
  276. +    char rcolors_str[17];
  277. +
  278. +        while ((int)(arg = next_arg(args, &args)) != NULL)
  279. +    {
  280. +        bright=0;
  281. +        char_=1;
  282. +        brightstr[0] = 'b';
  283. +            if (arg[0] != '-' && arg[0] != '+')
  284. +        {
  285. +                        say("%s is a bad argument for /rcolor", arg);
  286. +                        continue;
  287. +        }
  288. +                if (!strcmp(arg, "-all"))
  289. +        {
  290. +                    for (x = 0; x < 16; x++)
  291. +                                rcolors[x] = 0;
  292. +            say("all colors deselected");
  293. +        }
  294. +                else if (!strcmp(arg, "+all"))
  295. +        {
  296. +                        for (x = 0; x < 16; x++)
  297. +                                rcolors[x] = 1;
  298. +            say("all colors selected");
  299. +        }
  300. +                else
  301. +        {
  302. +/*                        color_to_i(arg+1, colorstr);*/
  303. +            x = 0;
  304. +            do  {
  305. +            
  306. +                switch (tolower(arg[char_]))
  307. +                {
  308. +                     case 'b':
  309. +                        if (!strcmp(arg+char_, "black"))
  310. +                        {    
  311. +                            x = BLACK;
  312. +                        }
  313. +                        else if (!strcmp(arg+char_, "blue"))
  314. +                        {                
  315. +                            x = BLUE;
  316. +                        }
  317. +                        else if (!strcmp(arg+char_, "brown"))
  318. +                        {
  319. +                            x = BROWN;
  320. +                        }
  321. +                        else
  322. +                        {
  323. +                            bright = TRUE;
  324. +                            char_++; 
  325. +                        }
  326. +                        break;
  327. +                     case 'c':
  328. +                        x = CYAN;
  329. +                        break;
  330. +                     case 'g':
  331. +                        x = GREEN;
  332. +                        break;
  333. +                    case 'r':
  334. +                        x = RED;
  335. +                        break;
  336. +                    case 'p':
  337. +                        x = PURPLE;
  338. +                        break;
  339. +                    case 'w':
  340. +                        x = WHITE;
  341. +                        break;
  342. +                    default:
  343. +                        put_it("YOU DUMBASS, THAT'S NOT A COLOR");
  344. +                               return;
  345. +                }
  346. +            } while (bright && x == 0);
  347. +                        
  348. +            if (x == 0) return;
  349. +                        x -= BLACK;
  350. +                        if (bright) {x += 8;} 
  351. +            else brightstr[0] = '\0';
  352. +                        rcolors[x] = 0;
  353. +                        if (arg[0] == '+') rcolors[x] = 1;
  354. +            say("%s%s %s", brightstr, arg+char_, selectstr[rcolors[x]]);
  355. +        }
  356. +
  357. +    }
  358. +
  359. +}
  360. +
  361. +char *
  362. +tolower_str(string)
  363. +        char *string;
  364. +{
  365. +        char *lower_str;
  366. +        int x;
  367. +
  368. +        lower_str = (char *)new_malloc(strlen(string)+1);
  369. +        for (x = 0; x <= strlen(string); x++)
  370. +                lower_str[x] = tolower(string[x]);
  371. +        lower_str[x] = '\0';
  372. +        return lower_str;
  373. +}
  374. + 
  375. +void
  376. +colorcmd(command, args, subargs)
  377. +        char    *command,
  378. +                *args,
  379. +        *subargs;
  380. +{
  381. +    char *name, *color;
  382. +    char colorstr[5];
  383. +    name_color *nc;
  384. +    int bright;
  385. +    char brightstr[]="bright ";
  386. +        char *lower_name;
  387. +    int x;
  388. +    
  389. +    
  390. +    if (((int)(name = next_arg(args, &args)) != NULL) &&
  391. +        ((int)(color = next_arg(args, &args)) != NULL))
  392. +    {
  393. +        colorstr[0] = '\0';
  394. +        bright = 0;
  395. +        do  {
  396. +            
  397. +        switch (tolower(color[0]))
  398. +        {
  399. +             case 'b':
  400. +                if (!strcmp(color, "black"))
  401. +                {    
  402. +                    colorstr[0] = BLACK;
  403. +                }
  404. +                else if (!strcmp(color, "blue"))
  405. +                {                
  406. +                    colorstr[0] = BLUE;
  407. +                }
  408. +                else if (!strcmp(color, "brown"))
  409. +                {
  410. +                    colorstr[0] = BROWN;
  411. +                }
  412. +                else
  413. +                {
  414. +                    bright = TRUE;
  415. +                    color++; 
  416. +                }
  417. +                break;
  418. +             case 'c':
  419. +                colorstr[0] = CYAN;
  420. +                break;
  421. +             case 'g':
  422. +                colorstr[0] = GREEN;
  423. +                break;
  424. +            case 'r':
  425. +                colorstr[0] = RED;
  426. +                break;
  427. +            case 'p':
  428. +                colorstr[0] = PURPLE;
  429. +                break;
  430. +            case 'w':
  431. +                colorstr[0] = WHITE;
  432. +                break;
  433. +            default:
  434. +                put_it("YOU DUMBASS, THAT'S NOT A COLOR");
  435. +                       return;
  436. +        }
  437. +        } while (bright && colorstr[0] == '\0');
  438. +        colorstr[1] = '\0';
  439. +        if (bright)
  440. +        {
  441. +            colorstr[1] = BRIGHT;
  442. +            colorstr[2] = '\0';
  443. +        }
  444. +        if (nc = find_nc_name(name))
  445. +        {
  446. +            strcat(nc->colorstr, colorstr);
  447. +        }
  448. +        else 
  449. +        {
  450. +            nc = (name_color *) new_malloc(sizeof(name_color));
  451. +            nc->name = (char *) new_malloc(strlen(name)+1);
  452. +                lower_name = (char *) new_malloc(strlen(name)+1);
  453. +                for (x = 0; x <= strlen(name); x++)
  454. +                        lower_name[x] = tolower(name[x]);
  455. +            strcpy(nc->name, lower_name);
  456. +            new_free(&lower_name);
  457. +            strcpy(nc->colorstr, colorstr);
  458. +            if (nc_start == NULL) 
  459. +            {
  460. +                nc_start = nc;
  461. +                nc_last = nc;
  462. +                nc->next = NULL;
  463. +            }
  464. +            else 
  465. +            {                
  466. +                nc_last->next = nc;
  467. +                nc_last = nc;
  468. +                nc->next = NULL;
  469. +            }
  470. +        }
  471. +        if (bright) 
  472. +        {
  473. +            strcpy(brightstr, "bright ");
  474. +        }
  475. +        else brightstr[0] = '\0';
  476. +        say("%s is now %s%s", nc->name, brightstr, color);
  477. +    }
  478. +        else
  479. +    {
  480. +        say("Usage: /COLOR name color");
  481. +        say("colors: black red green brown blue purple cyan white");
  482. +        say("for bright colors prefix b to the color <bred for bright red, etc>");
  483. +    }
  484. +}
  485. +
  486. +char *
  487. +color_of(name)
  488. +    char *name;
  489. +{
  490. +    int i=0;
  491. +    name_color *nc;
  492. +    int x,y;
  493. +
  494. +    if (nc = find_nc_name(name))
  495. +    {
  496. +        return nc->colorstr;
  497. +    }
  498. +    else 
  499. +    {
  500. +/*        colorstring[i++]=(name[0]+name[1]) % 8 + BLACK;*/
  501. +        /* black foreground is a 'bad thing'(TM) ;) */
  502. +/*        if (colorstring[i-1] == BLACK) colorstring[i-1]++;
  503. +        if (((name[0]+name[1]) % 16) > 8) colorstring[i++]=BRIGHT;
  504. +        colorstring[i]='\0';
  505. +        return colorstring;*/
  506. +                /* count number of selected colors */
  507. +        for (x = 0, y = 0; x < 16; x++)
  508. +                        if (rcolors[x] == 1) y++;
  509. +                if (y == 0)
  510. +        {
  511. +                        colorstring[0] = WHITE;
  512. +                        colorstring[1] = '\0';
  513. +                        return colorstring;
  514. +        }
  515. +                i = (name[0]+name[1]) % y;
  516. +                i++;
  517. +                for (x = 0, y = 0; y < i; x++)
  518. +                    if (rcolors[x] == 1) y++;
  519. +            i = 0;
  520. +                x--;
  521. +                if (x < 8)
  522. +        {
  523. +                        colorstring[i++] = x + BLACK;
  524. +        }
  525. +                else
  526. +        {
  527. +                        colorstring[i++] = (x - 8) + BLACK;
  528. +                        colorstring[i++] = BRIGHT;
  529. +        }
  530. +        colorstring[i] = '\0';
  531. +                return colorstring;
  532. +    }
  533. +}
  534. +
  535. +name_color *
  536. +find_nc_name(name)
  537. +    char *name;
  538. +{
  539. +    name_color *nc;
  540. +    char *lower_name;
  541. +    int x;
  542. +    
  543. +    lower_name = (char *) new_malloc(strlen(name)+1);
  544. +    for (x = 0; x <= strlen(name); x++) 
  545. +        lower_name[x] = tolower(name[x]);
  546. +    for (nc = nc_start; nc != NULL; nc = nc->next)
  547. +    {
  548. +        if (!strcmp(nc->name, lower_name))
  549. +        {
  550. +            new_free(&lower_name);
  551. +            return nc;
  552. +        }
  553. +    }
  554. +    new_free(&lower_name);
  555. +    return NULL;
  556. +}
  557. +    
  558. diff --unified --recursive --new-file ./source/ctcp.c ../colirc/source/ctcp.c
  559. --- ./source/ctcp.c    Fri Jan  6 07:16:34 1995
  560. +++ ../colirc/source/ctcp.c    Sun Dec 17 17:34:37 1995
  561. @@ -34,6 +34,7 @@
  562.  #include "dcc.h"
  563.  #include "names.h"
  564.  #include "parse.h"
  565. +#include "color.h"
  566.  
  567.  #define    CTCP_SHUTUP    0
  568.  #define    CTCP_VERBOSE    1
  569. @@ -669,20 +670,24 @@
  570.          *to,
  571.          *cmd;
  572.  {
  573. +    char cline[3];
  574. +    
  575.      if (cmd && *cmd)
  576.      {
  577.          int old;
  578.  
  579.          old = set_lastlog_msg_level(LOG_ACTION);
  580. +        cline[0] = WHITE; cline[1] = '\0';
  581. +        if (get_int_var(COLORLINE_VAR)) strcpy(cline, color_of(from));
  582.          if (is_channel(to))
  583.          {
  584.              message_from(to, LOG_ACTION);
  585.              if (do_hook(ACTION_LIST, "%s %s %s", from, to, cmd))
  586.              {
  587.                  if (is_current_channel(to, 0))
  588. -                    put_it("* %s %s", from, cmd);
  589. +                    put_it("* %s%s %s%s%c ", color_of(from), from, cline, cmd, WHITE);
  590.                  else
  591. -                    put_it("* %s:%s %s", from, to, cmd);
  592. +                    put_it("* %s%s%c:%s%s %s%s%c ", color_of(from), from, WHITE, color_of(to), to, cline, cmd, WHITE);
  593.              }
  594.          }
  595.          else
  596. diff --unified --recursive --new-file ./source/edit.c ../colirc/source/edit.c
  597. --- ./source/edit.c    Mon Apr  3 07:48:21 1995
  598. +++ ../colirc/source/edit.c    Sun Dec 17 14:51:53 1995
  599. @@ -52,6 +52,7 @@
  600.  #include "help.h"
  601.  #include "stack.h"
  602.  #include "queue.h"
  603. +#include "color.h"
  604.  
  605.  /*
  606.   * current_exec_timer - used to make sure we don't remove a timer
  607. @@ -207,6 +208,8 @@
  608.      { "CD",        NULL,        cd,            0 },
  609.      { "CHANNEL",    "JOIN",        e_channel,        0 },
  610.      { "CLEAR",    NULL,        clear,            0 },
  611. +    { "COLOR",    NULL,        colorcmd,        0 },
  612. +    { "COLOUR",    NULL,        colorcmd,        0 },
  613.      { "COMMENT",    NULL,        comment,        0 },
  614.      { "CONNECT",    "CONNECT",    send_comm,        0 },
  615.      { "CTCC",    NULL,        dcc,            0 },
  616. @@ -269,6 +272,8 @@
  617.      { "QUIT",    "QUIT",        e_quit,            NONOVICEABBREV},
  618.      { "QUOTE",    NULL,        quote,            0 },
  619.      { "RBIND",    0,        rbindcmd,        0 },
  620. +    { "RCOLOR",    NULL,        rcolorcmd,        0 },
  621. +    { "RCOLOUR",    NULL,        rcolorcmd,        0 },
  622.      { "REDIRECT",    NULL,        redirect,        0 },
  623.      { "REHASH",    "REHASH",    send_comm,        0 },
  624.      { "REQUEST",    NULL,        ctcp,            0 },
  625. diff --unified --recursive --new-file ./source/names.c ../colirc/source/names.c
  626. --- ./source/names.c    Thu Apr  6 20:37:25 1995
  627. +++ ../colirc/source/names.c    Sun Dec 17 14:51:53 1995
  628. @@ -24,6 +24,7 @@
  629.  #include "lastlog.h"
  630.  #include "list.h"
  631.  #include "output.h"
  632. +#include "color.h"
  633.  
  634.  static    char    mode_str[] = "iklmnpst";
  635.  
  636. @@ -552,6 +553,7 @@
  637.  {
  638.      ChannelList *chan;
  639.      NickList *tmp;
  640. +    name_color *nc;
  641.  
  642.      for (chan = channel_list; chan; chan = chan->next)
  643.      {
  644. @@ -561,6 +563,11 @@
  645.              {
  646.                  new_free(&tmp->nick);
  647.                  malloc_strcpy(&tmp->nick, new_nick);
  648. +                if (nc = find_nc_name(old_nick))
  649. +                {
  650. +                    new_free(&nc->name);
  651. +                    nc->name = tolower_str(new_nick);
  652. +                }
  653.              }
  654.          }
  655.      }
  656. diff --unified --recursive --new-file ./source/output.c ../colirc/source/output.c
  657. --- ./source/output.c    Fri Jan  6 07:16:56 1995
  658. +++ ../colirc/source/output.c    Sun Dec 17 14:51:53 1995
  659. @@ -27,6 +27,7 @@
  660.  #include "hook.h"
  661.  #include "ctcp.h"
  662.  #include "log.h"
  663. +#include "color.h"
  664.  
  665.      int    in_help = 0;
  666.  
  667. @@ -159,14 +160,16 @@
  668.  #endif
  669.      if (window_display)
  670.      {
  671. -        putbuf[0] = putbuf[1] = putbuf[2] = '*';
  672. -        putbuf[3] = ' ';
  673. +        putbuf[0] = SAY_COLOR;
  674. +        putbuf[1] = putbuf[2] = putbuf[3] = '*';
  675. +        putbuf[4] = ' ';
  676. +        putbuf[5] = WHITE;
  677.  #ifdef USE_STDARG_H
  678.          va_start(vl, format);
  679. -        vsprintf(&putbuf[4], format, vl);
  680. +        vsprintf(&putbuf[6], format, vl);
  681.          va_end(vl);
  682.  #else
  683. -        sprintf(&putbuf[4], format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
  684. +        sprintf(&putbuf[6], format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
  685.  #endif
  686.          add_to_log(irclog_fp, putbuf);
  687.          add_to_screen(putbuf);
  688. diff --unified --recursive --new-file ./source/parse.c ../colirc/source/parse.c
  689. --- ./source/parse.c    Sun Jan 15 22:22:55 1995
  690. +++ ../colirc/source/parse.c    Sun Dec 17 17:45:41 1995
  691. @@ -35,6 +35,7 @@
  692.  #include "numbers.h"
  693.  #include "parse.h"
  694.  #include "notify.h"
  695. +#include "color.h"
  696.  
  697.  #define STRING_CHANNEL '+'
  698.  #define MULTI_CHANNEL '#'
  699. @@ -437,12 +438,16 @@
  700.          *to;
  701.      char    *high;
  702.      int    no_flood;
  703. +    char    bwhite[]= {WHITE, BRIGHT, '\0'};
  704. +    char    cline[3];
  705.  
  706.  if (!from)
  707.          return;
  708.      PasteArgs(Args, 1);
  709.      to = Args[0];
  710.      ptr = Args[1];
  711. +    cline[0] = WHITE; cline[1] = '\0';
  712. +    if (get_int_var(COLORLINE_VAR)) strcpy(cline, color_of(from));
  713.      if (!to || !ptr)
  714.          return;
  715.      if (is_channel(to))
  716. @@ -549,15 +554,14 @@
  717.              doing_privmsg = 1;
  718.              if (no_flood && do_hook(list_type, "%s %s %s", from, 
  719.                  to, ptr))
  720. -                put_it("%s<%s>%s %s", high, from, high, ptr);
  721. +                put_it("%s<%s%s%s> %s%s%c ", bwhite, color_of(from), from, bwhite, cline, ptr, WHITE);
  722.              doing_privmsg = 0;
  723.              break;
  724.          case PUBLIC_OTHER_LIST:
  725.              doing_privmsg = 1;
  726.              if (no_flood && do_hook(list_type, "%s %s %s", from,
  727.                  to, ptr))
  728. -                put_it("%s<%s:%s>%s %s", high, from, to, high,
  729. -                    ptr);
  730. +                put_it("%s<%s%s%s:%s%s%s> %s%s%c ", bwhite, color_of(from), from, bwhite, color_of(to), to, bwhite, cline, ptr, WHITE);
  731.              doing_privmsg = 0;
  732.              break;
  733.          }
  734. diff --unified --recursive --new-file ./source/screen.c ../colirc/source/screen.c
  735. --- ./source/screen.c    Mon Apr  3 07:48:28 1995
  736. +++ ../colirc/source/screen.c    Sun Dec 17 14:51:54 1995
  737. @@ -35,6 +35,7 @@
  738.  #include "dcc.h"
  739.  #include "translat.h"
  740.  #include "exec.h"
  741. +#include "color.h"
  742.  
  743.      Window    *to_window;
  744.      Screen    *current_screen;
  745. @@ -440,7 +441,17 @@
  746.      {
  747.          switch (*ptr)
  748.          {
  749. +        case BLACK:
  750. +        case BLUE:
  751. +        case GREEN:
  752. +        case CYAN:
  753. +        case RED:
  754. +        case PURPLE:
  755. +        case BROWN:
  756. +        case WHITE:
  757. +        case BRIGHT:
  758.          case REV_TOG:
  759. +            
  760.          case UND_TOG:
  761.          case BOLD_TOG:
  762.          case ALL_OFF:
  763. @@ -510,6 +521,16 @@
  764.                  bold = display_bold(TOGGLE);
  765.                  bold = 1 - bold;
  766.              }
  767. +                        if (*ptr >= BLACK && *ptr <= WHITE)
  768. +                        {
  769. +                                fflush(current_screen->fpout);
  770. +                                fprintf(current_screen->fpout, "\e[0;3%dm", *ptr - BLACK);
  771. +                        }
  772. +                        if (*ptr == BRIGHT)
  773. +                        {
  774. +                                fflush(current_screen->fpout);
  775. +                                fprintf(current_screen->fpout, "\e[1m");
  776. +                        }
  777.              str = ++ptr;
  778.              break;
  779.          case '\007':
  780. @@ -1146,6 +1167,16 @@
  781.                  buffer[pos++] = *ptr;
  782.                  col++;
  783.                  break;
  784. +            case BLACK:
  785. +            case BLUE:
  786. +            case GREEN:
  787. +            case CYAN:
  788. +            case RED:
  789. +            case PURPLE:
  790. +            case BROWN:
  791. +            case WHITE:
  792. +            case BRIGHT:
  793. +                
  794.              case UND_TOG:
  795.              case ALL_OFF:
  796.              case REV_TOG:
  797. diff --unified --recursive --new-file ./source/status.c ../colirc/source/status.c
  798. --- ./source/status.c    Mon Apr  3 07:48:30 1995
  799. +++ ../colirc/source/status.c    Sun Dec 17 14:51:54 1995
  800. @@ -28,6 +28,7 @@
  801.  #include "names.h"
  802.  #include "ircaux.h"
  803.  #include "translat.h"
  804. +#include "color.h"
  805.  
  806.  extern    time_t    time();
  807.  
  808. @@ -603,7 +604,8 @@
  809.              {
  810.                  RJustifyPos = i;
  811.              }
  812. -            else if (buffer[i] != REV_TOG && buffer[i] != UND_TOG && buffer[i] != ALL_OFF && buffer[i] != BOLD_TOG)
  813. +            else if (buffer[i] != REV_TOG && buffer[i] != UND_TOG && buffer[i] != ALL_OFF && buffer[i] != BOLD_TOG
  814. +                 && (buffer[i] < BLACK || buffer[i] > WHITE) && buffer[i] != BRIGHT)
  815.              {
  816.                  if (RealPosition == CO)
  817.                  {
  818. @@ -662,7 +664,8 @@
  819.              {
  820.                  if (buffer[i] != window->status_line[i])
  821.                      break;
  822. -                if (buffer[i] != REV_TOG && buffer[i] != UND_TOG && buffer[i] != ALL_OFF && buffer[i] != BOLD_TOG)
  823. +                if (buffer[i] != REV_TOG && buffer[i] != UND_TOG && buffer[i] != ALL_OFF && buffer[i] != BOLD_TOG
  824. +                    && (buffer[i] < BLACK || buffer[i] > WHITE) && buffer[i] != BRIGHT)
  825.                      RealPosition++;
  826.              }
  827.          }
  828. @@ -1209,6 +1212,16 @@
  829.          {
  830.              switch(*s)
  831.              {
  832. +            case BLACK:
  833. +            case BLUE:
  834. +            case GREEN:
  835. +            case CYAN:
  836. +            case RED:
  837. +            case PURPLE:
  838. +            case BROWN:
  839. +            case WHITE:
  840. +            case BRIGHT:
  841. +                
  842.              case UND_TOG:
  843.              case ALL_OFF:
  844.              case REV_TOG:
  845. diff --unified --recursive --new-file ./source/vars.c ../colirc/source/vars.c
  846. --- ./source/vars.c    Wed Jan  4 22:39:56 1995
  847. +++ ../colirc/source/vars.c    Sun Dec 17 14:51:54 1995
  848. @@ -89,7 +89,8 @@
  849.      { "CLOCK_24HOUR",        BOOL_TYPE_VAR,    DEFAULT_CLOCK_24HOUR, NULL, reset_clock, 0, 0 },
  850.      { "CLOCK_ALARM",        STR_TYPE_VAR,    0, NULL, set_alarm, 0, 0 },
  851.      { "CMDCHARS",            STR_TYPE_VAR,    0, NULL, NULL, 0, 0 },
  852. -    { "COMMAND_MODE",        BOOL_TYPE_VAR,    DEFAULT_COMMAND_MODE, NULL, NULL, 0, 0 },
  853. +    { "COLORLINE",                  BOOL_TYPE_VAR,  DEFAULT_COLORLINE, NULL, NULL, 0, 0 },
  854. +           { "COMMAND_MODE",        BOOL_TYPE_VAR,    DEFAULT_COMMAND_MODE, NULL, NULL, 0, 0 },
  855.      { "CONTINUED_LINE",        STR_TYPE_VAR,    0, NULL, set_continued_line, 0, 0 },
  856.      { "DCC_BLOCK_SIZE",        INT_TYPE_VAR,    DEFAULT_DCC_BLOCK_SIZE, NULL, NULL, 0, 0 },
  857.      { "DEBUG",            INT_TYPE_VAR,    0, NULL, NULL, 0, 0 },
  858.